Some more quick changes.