Site fixes

Various fixed so the site is back to a deployable state