some more issues found in testing