Fix builder usage