various media fixups