Fixing compilation issues
Autocommit Wed Nov 19 11:02:41 EST 2014