CAT-497 #code-review fixes #497