More fixes to fun