Minor changes to Database Connector
Merged