Some more quick changes