Suppress needless completion
Fix a bug around feedback process
Minor fix