Chef: Some improvements