Fix types to allow attributes.