minor bug fixes for ios8