Merge pull request #671 from antmicro/fix-ci-issues

Fix ci issues