Fixed builder errors