A couple of minor post-completion tweaks