Startup script tweaks