Removed some magic numbers that no longer make sense in iOS 7 land