Fixing bugs with new local server implementation
Autocommit Tue Sep 23 14:11:33 EST 2014