Some parser fixes for DCD