#442 fixes due to change of schema