More fixes for transform.