Fixing compilation issues
Autocommit Wed Nov 19 11:46:23 EST 2014