Fixes to transformation