Minor improvements (4)