Xcode 6 beta 7

Two minor code changes to comply with Xcode 6 beta 7 and a fix for device rotation issues on iPad