Moar fixes
Fix attributes