Changes to support building a good package