Hardening Fixes

As discussed.

bc9586c makes sure that __wakeup()