Fix for transaction issues with updateing Tasks
Clean up