Fix load errors related to previous changes
Add the wonderful magit