Some more fixes for ios8