(#11) More fixes.