Fixes for correct setup of the package
3 files changed