Minor improvements'