Small fixes on transcode