Fixes for Launch Logic