More fixes for sites