fixes for nilpointer reference in fight module