More bug fixes on iOS