Fix double-play issues.