Fixing compilation issues
Autocommit Wed Nov 19 11:38:46 EST 2014