Fix some small issues found during testing