Fixing compilation issues
Autocommit Wed Nov 19 10:34:42 EST 2014