Merge small missing changes for less conversion