diff --git a/doc/man/conf.py b/doc/man/conf.py
index 743031b..49c0cb2 100644
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -25,7 +25,7 @@ today          = time.strftime('%Y-%m-%d', time.gmtime(maxdate))
 # -- Project configuration ------------------------------------------------
 
 project   = 'zathura'
-copyright = '2009-2015, pwmt.org'
+copyright = '2009-2018, pwmt.org'
 version   = '0.2.7'
 release   = '0.2.7'
 
diff --git a/zathura/database-plain.c b/zathura/database-plain.c
index a3dad91..49cbe2c 100644
--- a/zathura/database-plain.c
+++ b/zathura/database-plain.c
@@ -37,11 +37,12 @@
 #include <sys/file.h>
 #define file_lock_set(fd, cmd) flock(fd, cmd)
 #else
-#define file_lock_set(fd, cmd) \
-  { \
-  struct flock lock = { .l_type = cmd, .l_start = 0, .l_whence = SEEK_SET, .l_len = 0}; \
-  fcntl(fd, F_SETLK, lock); \
-  }
+static int
+file_lock_set(int fd, short cmd)
+{
+  struct flock lock = { .l_type = cmd, .l_start = 0, .l_whence = SEEK_SET, .l_len = 0};
+  return fcntl(fd, F_SETLK, lock);
+}
 #endif
 
 static void zathura_database_interface_init(ZathuraDatabaseInterface* iface);
diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c
index 36beb86..ff497bd 100644
--- a/zathura/shortcuts.c
+++ b/zathura/shortcuts.c
@@ -760,7 +760,6 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument,
       girara_debug("bisecting between first and last page because there are no jumps");
       zathura->bisect.start = 0;
       zathura->bisect.end = num_pages - 1;
-
     } else if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) {
       girara_debug("last jump doesn't match up, starting new bisecting");
       zathura->bisect.start = 0;