Fixing compilation issues
Autocommit Wed Nov 19 11:00:43 EST 2014