Fix some problems with the package