Tweaks from final run-through