Fix issues from getFanout change post-merge