yotam: fix bugs in build