Bouncer tweaks and stuff