Fix MvM support.  Also, make .inc compile correctly.