Fixed even more screw-ups.