Database, some fix