Ending tweaks