fixes for media