Bigfixs for some multi-site issues.