Fix 2 for compilation issues