Fixed small issues on ios