Task related bug fixes