timob-12176: fix a bunch of issues