Fixing compilation issues
Autocommit Wed Nov 19 10:59:43 EST 2014