auto-complete fixes