Some quick fixes found during the site upgrade