Minor fixes based on commentary.