More rdc-2.6 fixes by Daniel Gimpelevich, thanks !