Fix build with latest mate-common
Really fix build with latest mate-common