Some small changes here and there.