Small improvements to attribs