Minor changes for database