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