Tiny differences to back port from review of diff with BS Plus