PointCloud fixes