Fixed up object collisions