Fix a few problems related to commands.