Minor improvements (2)