M2
M2 copied to clipboard
Fix a few undistributed packages
This fixes some of the low-hanging fruit from #3446 to get some of the undistributed packages to load.