Getting build for iOS ready
Adding some missing changes from last commit