Minor improvements, no functional change