Completion improvements