Resolve build issues.