Linked the "Game Setup" and "Main Camera" prefabs Changed the SteamNative.dylib to 32bit-only until we figure out the issue with the universal build Didn't undo some automatic changes to a material and scene file by Unity, now I'm forced to merge