More minor comments