Fixes for missing include and for unicode task names.