Still fixing some git related thingies