Some fixes for media