fix errors found testing on other hosts