Iphone fixes

for https://www.pivotaltracker.com/story/show/55465586 and https://www.pivotaltracker.com/story/show/55465250