Small changes to make package "buildable".