Code Completion fixes