Final small tweaks for the night