Tweaks for bbPress trunk