Fixing compilation issues
Autocommit Wed Nov 19 11:12:57 EST 2014