Fixing favourites and other bugs