Resolve building issues.