WMS minor updates - Yunnie