More changes for media

See comments, commits description or diff