Fixes regressions found in iOS tests.