Completion fixes