Fixes for transformer edit