Task related bug fixes
Task related bug fixes