Tweaks from client