(#6) More fixes.