Fixes for Muslim Invasion CB

A few fixes. It also conforms with the vanilla diff whenever possible now.