More combat argument fixes