A dozen little fixes, some specific for iOS 6