Fixing bugs brought forward by reorganizing server
Autocommit Thu Jul 31 15:20:40 EST 2014