Misc patches

Fixes choose screen off option