x engine fixes
Merge branch 'master' of https://github.com/ska-sa/corr2