Fixing more problems with git. *sigh*.