Massive hacky fixes while the new site is in progress