Misc additional dcparse fixes