[TIMOB-13697] Some more tweaks and bug fixes.