Fixing compilation issues
Autocommit Wed Nov 19 11:42:40 EST 2014