Misc enhancements on iOS8 platform