Fixes for transforms