Multiple fixes to package