Fixed some sites framework-related bugs