Fix compilation issues: