General hardening of com_media