Fixed some missing imports and database path