Fix build issues related to new ParticleState class