Further Parser Fixes