Compilation issues fixed