Simplify/fix debug lines truncation