Some fixes for tasks