consolidator: fixing up a few minor things