Some additional changes after CR