Fixes to Task Counter