Minior Fixes on Stateclasses