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