Change to make it compilable from commandline for simulator in release