Fixing compilation issues
Autocommit Wed Nov 19 12:48:16 EST 2014