Small changes to match internal version.