HH-32333 fixes afer review