Add WakeLock to host, and other minor tweaks