Minor corrections due a mistake in previous git merge