Fix some internal binding issues (Issue #194)