Minor attribute fixes