[OTHER][MEDIA] small fixes and code cleanup