CONN-10, add fixes after code review