Client side tweaks