A few minor tweaks on top of Andre's changes.