Minor fixes and fluent StructuredOutput