Resolving build issues.