Minor completion bugs