Decode more fields correctly.