Minor attribution/migration refinements