Fixes on media
Fixes on media