Fixed some missing traits on S20