More minor alterations