Further minor improvements