#1001: #999: fixed some schema errors and #994
opened by njr2128