Fixing compilation issues
Autocommit Wed Nov 19 10:18:32 EST 2014