some fixes around imports and DB