[TIMOB-15527] Fixes to TiCore