Further improves debug output