Fix possibly compilation issues.