A few very small pydantic fixes and some small mistakes on my part.
requested review from @ahobbs
assigned to @awernle
approved this merge request
marked this merge request as ready
mentioned in commit 594f6e16
merged