Bugfixes for iOS/Android