Some particle fixes