Fixes issue #237 schema updates, and critical stopage #235