Various fixes

When reusing some of PCL features again I came accross some glitches that I am fixing here.