Fixing bugs in mutli-site