Fixes to enable building.  iPhone 5 support also.

More to come, hopefully. I want to follow up with some bugs I found and the suggestions from Jon Hull.