builder and daemon fixes