More startup derps fixes