ws fixes