Swipe2Wake and Simple Ondemand Fixes