minor fixes from pcl port