Fixes for https://github.com/ska-sa/meqtrees/issues/853