Minor changes here and there.