fix to site context not being present, other tidying