mate-user-share: multiple fixes