Fixing various minor problems.