Minor fixes for MiscCommands