Minor tweaks to commands, etc