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