Small tweaks as discussed with bmispelon