Fix a few small problems.