Minor enhancements to Task