A few final tweaks for company-mode