a few more fix ups