Improvements to task commands
Minor