Fix misc output from commands