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