more r6 fixes