Merge branch 'small-fixes-pydantic' into 'main'

A couple of fixes for section 6

See merge request !29