Tweaks for sweeping when screen on