Merge pull request #149 from brendandburns/lb

Fix a couple of problems with the lb merge.