Fixed issues with package being wrong