fix alignment issues
Merge branch 'attrib-fixture' into autostaging