Finish correcting TomDoc for utils