fixes from a bad merge