Fixing bugs brought forward by reorganizing server
Autocommit Mon Aug 04 09:56:35 EST 2014