Fixes for ios8