Fixes/Tweaks to friend store