Fix a bunch of issues.  BLB tests pass now.