Small fixes on BCH parser