Completion bug fixes