Improve decoder errors