Tweaks to Connect component