Some minor tweaks of my bugfix.