diff --git a/app/Makefile.am b/app/Makefile.am
index 4553c8e5b..f555d982e 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -41,8 +41,8 @@ install-exec-local:
 	fi
 
 	@echo "Installing the Gambas appdata file"
-	@$(INSTALL) -d $(DESTDIR)$(datarootdir)/appdata
-	@$(INSTALL) $(srcdir)/desktop/gambas3.appdata.xml $(DESTDIR)$(datarootdir)/appdata
+	@$(INSTALL) -d $(DESTDIR)$(datarootdir)/metainfo
+	@$(INSTALL) $(srcdir)/desktop/gambas3.appdata.xml $(DESTDIR)$(datarootdir)/metainfo
 	
 	@echo "Installing the Gambas template projects"
 	$(INSTALL) -d $(DESTDIR)$(gbdatadir)/template;
@@ -53,7 +53,7 @@ uninstall-local:
 	@rm -f $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION)
 	@rm -f $(DESTDIR)$(bindir)/gbw$(GAMBAS_VERSION)
 	@(cd $(srcdir)/src; for p in `cat INSTALL`; do rm -f $(DESTDIR)$(bindir)/$$p.gambas; done)
-	@rm -rf $(DESTDIR)$(datarootdir)/appdata/gambas3.appdata.xml
+	@rm -rf $(DESTDIR)$(datarootdir)/metainfo/gambas3.appdata.xml
 	@rm -rf $(DESTDIR)$(gbdatadir)/template
 
 dist-hook:
diff --git a/gb.openssl/src/c_cipher.c b/gb.openssl/src/c_cipher.c
index 1bd03b98d..46490b365 100644
--- a/gb.openssl/src/c_cipher.c
+++ b/gb.openssl/src/c_cipher.c
@@ -321,7 +321,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd;
 
 	bzero(salt, sizeof(salt));
 	if (MISSING(salt)) {
-		assert(RAND_pseudo_bytes(salt, sizeof(salt)));
+		assert(RAND_bytes(salt, sizeof(salt)));
 	} else {
 		bzero(salt, sizeof(salt));
 		memcpy(salt, STRING(salt), MIN(sizeof(salt), LENGTH(salt)));
@@ -397,7 +397,7 @@ BEGIN_METHOD(CipherMethod_EncryptSalted, GB_STRING plain; GB_STRING passwd)
 	char key[EVP_CIPHER_key_length(_method)];
 
 	bzero(key, sizeof(key));
-	RAND_pseudo_bytes(salt, sizeof(salt));
+	RAND_bytes(salt, sizeof(salt));
 	PKCS5_PBKDF_HMAC_SHA1(STRING(passwd), LENGTH(passwd), salt,
 			      sizeof(salt), ITER, sizeof(key), key);