Fixes for new slumber + patches for slumber itself.