package issues fixed