Fixes to package