Fix multiple minor problems.