Adding fixes for support media on modules