Fixing compilation issues
Autocommit Wed Nov 19 11:42:39 EST 2014