more fixups for decoder stuff...ugh...