Adds partial fixes for iphone4