Favorites fixes

Some small fixes for favorites.