Wakeup Fixes

Lots of small improvements included in this commit.