Continuing to fix tracking issues with git