diff --git a/packages/meteor-accounts-saml/package.js b/packages/meteor-accounts-saml/package.js
index 6771ecdd678d..4c080b8739d2 100644
--- a/packages/meteor-accounts-saml/package.js
+++ b/packages/meteor-accounts-saml/package.js
@@ -8,7 +8,15 @@ Package.describe({
 Package.on_use(function(api) {
 	api.use([
 		'ecmascript',
+		'http',
+		'accounts-base',
 	]);
+	api.use([
+		'routepolicy',
+		'webapp',
+		'rocketchat:lib',
+		'service-configuration',
+	], 'server');
 
 	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');
diff --git a/packages/meteor-accounts-saml/server/saml_utils.js b/packages/meteor-accounts-saml/server/saml_utils.js
index fc9ff50d6902..1331abd69fb7 100644
--- a/packages/meteor-accounts-saml/server/saml_utils.js
+++ b/packages/meteor-accounts-saml/server/saml_utils.js
@@ -9,7 +9,7 @@ import array2string from 'arraybuffer-to-string';
 // var prefixMatch = new RegExp(/(?!xmlns)^.*:/);
 
 
-const SAML = function(options) {
+export const SAML = function(options) {
 	this.options = this.initialize(options);
 };
 
@@ -545,7 +545,3 @@ SAML.prototype.generateServiceProviderMetadata = function(callbackUrl) {
 		newline: '\n',
 	});
 };
-
-export {
-	SAML,
-};
diff --git a/packages/meteor-autocomplete/package.js b/packages/meteor-autocomplete/package.js
index 18d5164df4e0..763da8c1ddb3 100755
--- a/packages/meteor-autocomplete/package.js
+++ b/packages/meteor-autocomplete/package.js
@@ -8,9 +8,17 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'templating',
+		'mongo',
+		'ddp',
 	]);
-	api.use('dandv:caret-position@2.1.0-3', 'client');
+
+	api.use([
+		'blaze',
+		'templating',
+		'jquery',
+		'dandv:caret-position@2.1.0-3',
+	], 'client');
+
 	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');
 });