client/server: follow up official repository changes