Minor changes to support JDBC connections, AWS sampledb