Fixes for iPhone6

This resolves #62.