Fixes to transform origin feature