US632 - fix issues found during testing