Initial mbc7 support.
Minor changes