Scattered improvements