HHH-7919 : Miscellaneous bugfixes