fix various problems
Merge branch 'master' of github.com:ska-sa/papino