Fixes for ios7