Fixed package issues