Fix some ABA, not all