Minor tweak for both client and server