Fixes to package files