More v6 updates