do some tweaks for client