small changes

small chnges for proper support in I os