iOS simulator fix, plus roll-up from previous commit message