Further minor changes