Attribute fixups and layout fixes