Small adaptions.