Data base fixes