Minor fixes according to Github discussion.