HIVE-8542: fix according to RB comments