More multisite fixes