Some more changes to try and stop units waiting forever for thrown weapons that are no longer valid