Adds fixes for iphone4 breaks