Adjust combat odds calculation for bigger fights
Fix some warnings