changes to make package build work