multisite fixes