Fix accidental global and wrap up attributes