Merge: Fixes for attributes