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