Fix git bug and stuff