More tweaks for smooth running