Sarina/fix git import

Two of @dianakhuang @cpennington @flowerhack