Fixing compilation issues
Autocommit Wed Nov 19 11:12:56 EST 2014