Small changes to DB connection