Further minor fixes