Some more small changes.