debug enhancements