All compilation issues fixed