Fix build, state