More wordclass fixes
fixes by master