Fix git commits (try 7)