Transform improvements