Various fixes to make super dev mode work correctly