Fix up some issues with 1.1 api

Add iPhone 5 support