Sanity check fixes (cross references)