Improve iOS7+ performance