Fix building issues.