[TIMOB-12833] More bug fixes