fix some issues with the new options binding implementation