#731

fix some more issues found in testing