Cleaning up tasking problems