CONN-1300 Fixed issues found during testing..