Mostly client tweaks