Fix issues with metalchris' git