Few more fixes to script: transforms correct