wakeupCall Improvements