Fix some AttackMedic/mech bugs/regressions