Fixes for States