Fix missing pkgs and other small stuff

Change-Id: I46ac98982eab5a64c33c012e622f8011592b1829