trivial ws consistency fixes`