Tweaks for public viewing