Fixed some missing changes