More minor changes!