Fixing bugs with new local server implementation
Autocommit Tue Sep 23 14:16:32 EST 2014