Fixing bugs with new local server implementation
Autocommit Tue Sep 23 15:10:33 EST 2014