fix some more ws problems