Fixing a couple minor issues found during the (86657) code review.

Implements: blueprint convert-to-pcl-lib
Change-Id: Iaa87fba1daa65ef55ab6ac8e9a1544ac15b108c1