fixes for task calling