Bug fixes, completely separated scope of OptionBinder and Scope