More fixes to make SudoWrite workflow easier