a few more fixes for issues found during at scale tests