Some fixes for friends