Fixing crashes from Simulator refactor