Minor improvements to various commands