[JBTM-1453] Fix build errors