Fixing compilation issues
Autocommit Wed Nov 19 10:55:43 EST 2014