Minor changes to auto-complete