Fix block builder bug(s).