Fix some minor problems.