Fixing up some builder issues.