Further minor updates