Added some more missing changes