Bug fixes for beta iOS SDK