misc - bug fixes including schema reduction