Minor improvements (5)