Some fixes for package