more attribution fixes