Small bug fixes in builder