Couple bugs in this area. All fixed for b2.