Fixes to ParticleSystem
Merge fixes
ParticleSystem fixes