diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua
index 3ccf51ab..a63d0749 100644
--- a/modules/addons/discord-alerts.lua
+++ b/modules/addons/discord-alerts.lua
@@ -6,11 +6,12 @@ local Colors = require 'utils.color_presets' --- @dep utils.color_presets
 local write_json, format_time = _C.write_json, _C.format_time --- @dep expcore.common
 local config = require 'config.discord_alerts' --- @dep config.discord_alerts
 
+local playtime_format = { short = true, hours = true, minutes = true, string = true }
 local function append_playtime(player_name)
     if not config.show_playtime then return player_name end
     local player = game.get_player(player_name)
     if not player then return player_name end
-    return player.name..' ('..format_time(player.online_time)..')'
+    return player.name..' ('..format_time(player.online_time, playtime_format)..')'
 end
 
 local function get_player_name(event)
diff --git a/modules/control/jail.lua b/modules/control/jail.lua
index b4f7f422..1e37fbfa 100644
--- a/modules/control/jail.lua
+++ b/modules/control/jail.lua
@@ -91,6 +91,13 @@ function Jail.jail_player(player, by_player_name, reason)
     local roles = get_roles(player)
     old_roles[player.name] = roles
 
+    player.walking_state = { walking = false }
+    player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
+    player.mining_state = { mining = false }
+    player.shooting_state = { state = defines.shooting.not_shooting }
+    player.picking_state = false
+    player.repair_state = { repairing = false }
+
     assign_roles(player, 'Jail', by_player_name, nil, true)
     unassign_roles(player, roles, by_player_name, nil, true)