Debug info improvements