Minor improvements for scaled image/video support.