Minor tweaks to startup and cranking