Fix v1.2.2 attr errors and missing var

Merged Bruce Flynn requested to merge fix-attr-errs into master

Merge request reports