diff --git a/inc/lektor/commands.h b/inc/lektor/commands.h
index 56b7b52043263b9331528e2d15227f5cc5ff8940..452d46bb66de87a963e52de47934b0e08912540e 100644
--- a/inc/lektor/commands.h
+++ b/inc/lektor/commands.h
@@ -82,8 +82,8 @@ enum lkt_playback_option {
 bool command_set_playback_option(struct lkt_state *srv, size_t c, enum lkt_playback_option opt, char *args[LKT_MESSAGE_ARGS_MAX]);
 
 /* Authentificate users */
-bool command_password(struct lkt_state *srv, size_t c,              char *argv[LKT_MESSAGE_ARGS_MAX]);
-bool command_user_add(struct lkt_state *srv, size_t c, sqlite3 *db, char *argv[LKT_MESSAGE_ARGS_MAX]);
+bool command_password(struct lkt_state *srv, size_t c,                       char *argv[LKT_MESSAGE_ARGS_MAX]);
+bool command_user_add(struct lkt_state *srv, size_t c, volatile sqlite3 *db, char *argv[LKT_MESSAGE_ARGS_MAX]);
 
 /* Program management control */
 bool command_restart(struct lkt_state *srv, size_t c);
diff --git a/src/config.c b/src/config.c
index 7f1b3ada29f604d5212325d8e3343933aefe045b..e9348887180bb8790c50fc7664f06de2dd608e80 100644
--- a/src/config.c
+++ b/src/config.c
@@ -44,7 +44,7 @@ load_so(const char *const mod_path, const char *const mod_init, void *mod)
 }
 
 inline int
-load_module_by_name(sqlite3 *db, const char *name, void *mod)
+load_module_by_name(volatile sqlite3 *db, const char *name, void *mod)
 {
     char mod_path[PATH_MAX], mod_load[INI_MAX_LINE];
 
@@ -58,7 +58,7 @@ load_module_by_name(sqlite3 *db, const char *name, void *mod)
 }
 
 inline static int
-validate_conf(sqlite3 *db)
+validate_conf(volatile sqlite3 *db)
 {
 #define CHK_OPTION(section, name)                                       \
     if (!database_config_exists(db, section, name)) {                   \
@@ -164,9 +164,9 @@ found:
 }
 
 int
-config_new(sqlite3 *db, const char *conf)
+config_new(volatile sqlite3 *db, const char *conf)
 {
-    if (ini_parse(conf, handler, db)) {
+    if (ini_parse(conf, handler, (void *) db)) {
         LOG_ERROR("Failed to parse file %s", conf);
         return 1;
     }
@@ -180,7 +180,7 @@ config_new(sqlite3 *db, const char *conf)
 }
 
 int
-config_open(sqlite3 *db)
+config_open(volatile sqlite3 *db)
 {
     char conf_file[PATH_MAX];
     int ret = 1;