Even more B&W fixes