More 'simulator_target?.named simulator' fixes