Further minor fixes.