Fix "only" fields and wrap errors as a collection per spec