client/server: fixup missing TRIM conversions