same fixes for site as well