Minor improvements (3)