Fixed issues with Blocked mode of WS and colours on WS