Some more tweaks to monitor client and server