Add flags and tweak media verification