Fixed a few bugs with builder