Fixed git bugs
More fixes