Fixed som problems with the package setup