Fix builder issues.