Some minor fixes
Add package file