Some fixes to the new attribute system.