Sanity check related changes.