Fix git commits (try 6)