Fix a couple of problems with the lb merge.