Fix some calls to decode