Fixed more binding issues.