Minor changes before PR.