fix(build): fix various small bugs

related to #CAM-2923