Fixing compilation issues
Autocommit Wed Nov 19 09:30:32 EST 2014