Fixes to Follow feature.