Small fixes for the RDB/NDS interaction fixup