Fix up decoder
Fix compare