Clean up task states
Add support for Intel C++ compiler 14