Fixes on state app