Fix the conflicts with base 4.7