Minor data parser enhancements