minor fixes sitewide