Add -D to more utilities