[JBTM-2070] Miscellaneous changes