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