Tweaks to retirement handling