more build/pkg fixes

Change-Id: Ia21641781e45c2bbfc63cc07c5dcd6cacdde7c77