CONN-192, add fixes after code review