Fixing various bugs
Autocommit Wed Dec 10 08:32:51 EST 2014