fixes for state conversion
fixes for state conversion

altaf-ali/dfr-browser,agoldst/dfr-browser,agoldst/dfr-browser,agoldst/dfr-browser,agoldst/dfr-browser,altaf-ali/dfr-browser,altaf-ali/dfr-browser,altaf-ali/dfr-browser