parser fixes as nathan pushed