Minor adjustments to a few commands