Fixed breaking changes with iOS7.1. Misc minor fixes from beta test.