packaging fixes and script issue