Minor tweaks and improvements

Included are minor tweaks I did to slightly improve engine startup and to run my full in-memory specs.