compilation issues fixed