Continued attempts to fix hang on launch