Fix miscellaneous auto-completion bugs