Extend custom repair mat support to armor. Fix more early oredict