Minor changes for Monster WSs