More fixes to fountain code