Fixing some consistency issues in binding.