Some bugfix
Merge branch 'curiosity' of https://github.com/poppy-project/poppy-software into curiosity