Tweaks to response