Small iOS fixes

This fixes a couple of issues seen on iOS