Fixing compilation issues
Autocommit Wed Nov 19 11:15:44 EST 2014