Fixing compilation issues
Autocommit Wed Nov 19 10:18:33 EST 2014