Fixed compile from some commits and reverted "added two wakelocks" commit from TNP