BP tweaks; https://github.com/websharks/s2member/issues/162