- rel 7; fixes from fc that took these from upstream