ADSP - (Fix 0006) Handling corrections