diff --git a/features/desktopish/autolock.nix b/features/desktopish/autolock.nix
index ea0eac5..d0b5c1c 100644
--- a/features/desktopish/autolock.nix
+++ b/features/desktopish/autolock.nix
@@ -5,11 +5,9 @@
     enable = true;
     time = 5; # mins
 
-    # Not sure if some modes are the cause of system freeze
-    # So deterministically pick one.
-    locker = "${pkgs.xlockmore}/bin/xlock -mode space";
+    locker = "${pkgs.xlockmore}/bin/xlock";
 
-    # Suspend after sometime (enable this after things are okay)
+    # Suspend asap after lock. 
     killtime = 10; # mins
     killer = "${pkgs.systemd}/bin/systemctl suspend";
   };
diff --git a/features/postgrest.nix b/features/postgrest.nix
index 9dfe729..9ac8979 100644
--- a/features/postgrest.nix
+++ b/features/postgrest.nix
@@ -33,7 +33,7 @@ in
       ExecStart =
         let pgrstConf = pkgs.writeText "pgrst.conf" ''
           db-uri = "postgres://postgres@localhost/postgres"
-          db-schema = "nixcloud"
+          db-schema = "api"
           # TODO: change when going production
           db-anon-role = "postgres"
           server-port = 7000