Tweaks for better battery life