Assorted martial arts bug fixes