some bug fixes
Merge branch 'site_consistency'