More rdc fixes, thanks to Daniel Gimpelevich