Debugging statements enhancements