Bug fixes for wresume

Previous changes introduced some bugs into wresume, now fixed.

Also dependencies on core-counter are handled more gracefully.