Small code updates for the new version.