Minor tweaks - one bug fixed, one introduced