Minor fixes from b+