MARMOTTA-24: fixed building issues