Fix two particel bugs