Fixing compilation issues
Autocommit Wed Nov 19 11:13:02 EST 2014