Fixes to site bugs