Change output buffers to use task ids
Fix intellij warning