Import changes made by BJW when building packages