a few fix ups