[transforms] Fixed 2 bugs