Transformation class fixes