Fixed simulator build issues