Some fixes to the reset util