Particle fixes and structure modifications