Fixing up transcode issues