Fixing compilation issues
Autocommit Wed Nov 19 10:57:43 EST 2014