Various fixes all around
Merge branch 'master' of https://github.com/danickfort/champgen