20820 Fix some JSON-Schema issues