More fixes to package file