Minor tweaks according to reviewer request