Fixing compilation issues
Autocommit Wed Nov 19 11:09:33 EST 2014