Fixes for class-and-assets-loading-related startup bug on OSX