Fixes for iPhone 4S