Fixes backwards compatibility issues where state was missing