various db-related fixes