Parsing tweaks