Media module -> 2 little bug fix