State Fixes