Fixing DB connectivity issues when running in web server
Benchmark - Fixed a bunch of little stuff