Support for MS debug kits