Fixing compilation issues
Autocommit Wed Nov 19 11:07:32 EST 2014