A few changes on All Site Masters!!!