Final tweaks from Transformation team