Minor fixes to fanout