Fix a few issues with task validation changes