Code review suggested fixes
Correct the decode handling for correct compatibility

Signed-off-by: David Zafman <dzafman@redhat.com>