Fix some issues with new options binding.