Fix a few command bugs