Updates for WSA dashboard bugs