Address a couple of SA warnings.