Misc. repair kit fix.

Fixes #6685.