Another bunch of attributes fixes