Fixes for RawOptionSetType changes in beta 6.