another small set of fixes