Builder fixes and simple vardump test