Minor improvement changes