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