Fixes for fight