Fixed up autostart IDs