a few more CDU fixes