Merge remote-tracking branch 'pq/simple-fixes'

diff --cc src/compositor.c
index afa0848,4e4c66d..235b4a2
--- 1/src/compositor.c
--- 2/src/compositor.c
+++ b/src/compositor.c
@@@ -2637,9 -2639,8 +2638,9 @@@ int main(int argc, char *argv[]
        int i;
        char *backend = NULL;
        char *shell = NULL;
 +      char *module = NULL;
        int32_t idle_time = 300;
-       int32_t xserver;
+       int32_t xserver = 0;
        char *socket_name = NULL;
        char *config_file;