Minor enhancements for EVideo edition