Integrated bugfixes for generic parser