More aggressive debug code