Fixing compilation issues
Autocommit Wed Nov 19 10:40:22 EST 2014