Minor changes to transformations
Merged.