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