osd + encoding fixes