Attempting to fix database issues