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