Media fixes by @bradrisse for issue #114