Fixes for multisite support