client/server: update for trim addition