diff --git a/db.py b/db.py
index 9cc7b5d273db4a589cc3eef117aa391be9733576..db07d3397e35ddbcd677e3ea35d225d62f84bafa 100644
--- a/db.py
+++ b/db.py
@@ -41,7 +41,11 @@ def query(operation, *params):
 		request.db.execute(operation, params)
 	else:
 		return []
-	return request.db.fetchall()
+	try:
+		rows = request.db.fetchall()
+	except:
+		rows = []
+	return rows
 
 @app.teardown_request
 def commit_db(*args):
diff --git a/db_schema.sql b/db_schema.sql
index e39e0096c00e754088552eaa23c0f76ffbfc62cd..bb9e81cc2725f451f34cd3a5086a0940031e1136 100644
--- a/db_schema.sql
+++ b/db_schema.sql
@@ -105,8 +105,7 @@ CREATE TABLE IF NOT EXISTS `log` (
 	`time` datetime NOT NULL,
 	`object` varchar(10),
 	`obj_id` INTEGER,
-	`path` varchar(255) NOT NULL,
-	PRIMARY KEY (ip, id, time, path)
+	`path` varchar(255) NOT NULL
 );
 CREATE TABLE IF NOT EXISTS `streams` (
   `handle` varchar(32) NOT NULL PRIMARY KEY,
diff --git a/server.py b/server.py
index be1aa86f3aa3870885bb59346bd65ce6eb215488..31bf7f83f786039ae2a5f7a42c944fef09c42be1 100755
--- a/server.py
+++ b/server.py
@@ -161,7 +161,7 @@ def edit():
 		'site_texts': ('site_texts', 'key', ['value']),
 		'videos': ('videos_data', 'id', ['visible'])
 	}
-	query('BEGIN TRANSACTION')
+	query('BEGIN')
 	if request.is_json:
 		changes = request.get_json().items()
 	else:
@@ -172,7 +172,7 @@ def edit():
 		assert column in tabs[table][2]
 		query('UPDATE %s SET %s = ? WHERE %s = ?'%(tabs[table][0], column,
 					tabs[table][1]), val, id)
-	query('COMMIT TRANSACTION')
+	query('COMMIT')
 	return "OK", 200
 
 @app.route('/auth')