Minor changes for latest.