Completion bug fixes. Hxml completion improvements.