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