More minor polish