Fixes for Particles