Fixing wakeup and what not