Fix git commits (try 4)