Fixing bugs with new local server implementation
Autocommit Tue Sep 23 15:12:32 EST 2014