CON-1446 | minor fixes