Word counter fixes