some fixes for iOS7