DB connection & deprecated node handler fixes