completion tweaks