More tweaks for those hard to reach places