WS: Minor changes