Mods to allow debug on foreign hardware