Fixing some issues with task parsing