CSPACE-6057: Fixed misc generated bindings problems.