Tweaks for 'macro mode'