Cleanups
Add missing attributions