Further sanity check fixes.