bug fixes in the builder.