Post Task bug fixes