couple fixes for the schema from newest spec version