Changes to retirement handling