Minor improvements to favourite branch

Minor improvements and fixes.