More asteroid/loading fixes