Some minor changes here and there