Merge branch 'jziebinski/fixes' into 'main'

Fixes if the python generator

See merge request !4