More wordclass fixes