Restore roster
Fix notifications spec