More block builder updates