Fixes to help friends integration