Add dbg support
Work around SK_RUN_FILTER