mate-utils: multiple fixes