Format Parser: Minor Fixes