Minor attribute fixes
Minor attribute fixes