Updates for ios 8