Media notices fix

Fixes #586