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