Bugfixes for successful package and run