Further alignment to iOS imll