Transform fixes