Fixup a few methods in ws package