Minor edits, reduce unwanted retirements