More multi-site bug fixes