Fixing binding issues.