tiny changes to prepare for mpv support