Auto-Completion fixes