Fixes for tasks