Add corrections suggested by @NelleV