Fixes for the transformer