Minor DRC fixes
more minor DRC fixes