Merge "Fix some attribute issues"