Updates for company-mode and (sr-)speedbar