Some changes to autostart