Minor fixes incorporating Thomas' feedback.