Final tweaks to get the startup process working