API tweaks and hopefully resolving PCL issues