Fixing compilation issues
Autocommit Wed Nov 19 11:39:47 EST 2014