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